Google Mobile/Open Romance of the Three Kingdoms"GoogleAndroid"

Fork

[Sangokushi-svn] [SVN_Comitted] [483]

OpenSangokushi commit ML sango****@lists*****
2011年 2月 5日 (土) 03:29:57 JST

• 前の記事 [Sangokushi-svn] [SVN_Comitted] [482] オープニング時のTwitter認証のみ外したものをTrunkに反映。
• 次の記事 [Sangokushi-svn] [SVN_Comitted] [484] 今日、もとの状態でテストしていましたが、akifumi3さんに行って頂いた修正と、プレイヤーの位置が飛んでしまうのは、無関係でした。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 483
          http://sourceforge.jp/projects/sangokushi/svn/view?view=rev&revision=483
Author:   akifumi3
Date:     2011-02-05 03:29:56 +0900 (Sat, 05 Feb 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/OpenSangokushi/gen/jp/or/cute/sangokushi/R.java
    trunk/OpenSangokushi/res/layout/opening.xml

Removed Paths:
-------------
    trunk/OpenSangokushi/bin/OpenSangokushi.apk
    trunk/OpenSangokushi/bin/classes.dex
    trunk/OpenSangokushi/bin/jp/
    trunk/OpenSangokushi/bin/resources.ap_

Property Changed:
----------------
    trunk/OpenSangokushi/res/layout/opening.xml

Deleted: trunk/OpenSangokushi/bin/OpenSangokushi.apk
===================================================================
(Binary files differ)

Deleted: trunk/OpenSangokushi/bin/classes.dex
===================================================================
(Binary files differ)

Deleted: trunk/OpenSangokushi/bin/resources.ap_
===================================================================
(Binary files differ)

Modified: trunk/OpenSangokushi/gen/jp/or/cute/sangokushi/R.java
===================================================================
--- trunk/OpenSangokushi/gen/jp/or/cute/sangokushi/R.java	2011-02-04 18:20:43 UTC (rev 482)
+++ trunk/OpenSangokushi/gen/jp/or/cute/sangokushi/R.java	2011-02-04 18:29:56 UTC (rev 483)
@@ -1,144 +1,142 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package jp.or.cute.sangokushi;
-
-public final class R {
-    public static final class anim {
-        public static final int logo_scale=0x7f040000;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int solid_blue=0x7f060001;
-        public static final int solid_green=0x7f060002;
-        public static final int solid_red=0x7f060000;
-        public static final int solid_white=0x7f060004;
-        public static final int solid_yellow=0x7f060003;
-        public static final int start_button=0x7f060005;
-    }
-    public static final class drawable {
-        public static final int castle=0x7f020000;
-        public static final int desert=0x7f020001;
-        public static final int dra=0x7f020002;
-        public static final int forest=0x7f020003;
-        public static final int gi=0x7f020004;
-        public static final int gi_bg=0x7f020005;
-        public static final int go=0x7f020006;
-        public static final int go_bg=0x7f020007;
-        public static final int grass=0x7f020008;
-        public static final int icon=0x7f020009;
-        public static final int king=0x7f02000a;
-        public static final int king_back=0x7f02000b;
-        public static final int loading=0x7f02000c;
-        public static final int logo=0x7f02000d;
-        public static final int map_draft=0x7f02000e;
-        public static final int mountain=0x7f02000f;
-        public static final int openingback=0x7f020010;
-        public static final int player=0x7f020011;
-        public static final int player_back=0x7f020012;
-        public static final int street=0x7f020013;
-        public static final int syoku=0x7f020014;
-        public static final int syoku_bg=0x7f020015;
-        public static final int tree=0x7f020016;
-        public static final int water=0x7f020017;
-    }
-    public static final class id {
-        public static final int Button01=0x7f080025;
-        public static final int ChatView=0x7f080007;
-        public static final int EditText01=0x7f080024;
-        public static final int LinearLayout01=0x7f080000;
-        public static final int LinearLayout02=0x7f080001;
-        public static final int LinearLayout03=0x7f08000a;
-        public static final int LinearLayout04=0x7f080002;
-        public static final int LinearLayout06=0x7f080014;
-        public static final int ListView01=0x7f080015;
-        public static final int MapView=0x7f080008;
-        public static final int ScrollView01=0x7f08001e;
-        public static final int StatusDetailView=0x7f080009;
-        public static final int StatusView=0x7f080005;
-        public static final int TableLayout01=0x7f080017;
-        public static final int TableRow01=0x7f080018;
-        public static final int TableRow02=0x7f080019;
-        public static final int TableRow03=0x7f08001b;
-        public static final int TextView01=0x7f08000b;
-        public static final int TextView02=0x7f080003;
-        public static final int TextView03=0x7f080004;
-        public static final int TextView04=0x7f08001a;
-        public static final int TextView05=0x7f08001c;
-        public static final int TextView06=0x7f08001d;
-        public static final int Title01=0x7f080012;
-        public static final int Title02=0x7f080013;
-        public static final int TweetListView=0x7f080026;
-        public static final int WholeMap=0x7f080006;
-        public static final int edittext_name=0x7f08000e;
-        public static final int lobby_button=0x7f080023;
-        public static final int loginBtn=0x7f080011;
-        public static final int logo=0x7f08001f;
-        public static final int map=0x7f080016;
-        public static final int name=0x7f08000d;
-        public static final int presetBtn=0x7f080010;
-        public static final int serif=0x7f08000f;
-        public static final int start_button=0x7f080021;
-        public static final int title=0x7f08000c;
-        public static final int tweet_name=0x7f080027;
-        public static final int tweet_tweet=0x7f080028;
-        public static final int twitter_button=0x7f080022;
-        public static final int twitter_image=0x7f080020;
-    }
-    public static final class layout {
-        public static final int battle=0x7f030000;
-        public static final int initialization=0x7f030001;
-        public static final int list=0x7f030002;
-        public static final int lobby=0x7f030003;
-        public static final int main=0x7f030004;
-        public static final int map=0x7f030005;
-        public static final int opening=0x7f030006;
-        public static final int popup=0x7f030007;
-        public static final int tweetlist=0x7f030008;
-    }
-    public static final class raw {
-        public static final int bgm=0x7f050000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f070000;
-        public static final int auth_progress_text=0x7f070008;
-        public static final int auth_progress_title=0x7f070007;
-        public static final int authenticate_button=0x7f070003;
-        public static final int authenticated=0x7f070005;
-        public static final int bad_value=0x7f070006;
-        public static final int cancel=0x7f070019;
-        public static final int chat_edit_hint=0x7f07000c;
-        public static final int commander=0x7f07001c;
-        public static final int compete=0x7f07001a;
-        public static final int game_user=0x7f07001d;
-        public static final int general=0x7f07001b;
-        public static final int login_button=0x7f07000e;
-        public static final int login_settings=0x7f07000d;
-        public static final int menu_reset_userstate=0x7f07001f;
-        public static final int menu_reset_userstate_comlplatemessage=0x7f070020;
-        public static final int menu_reset_userstate_notregistered=0x7f070021;
-        public static final int not_authenticated=0x7f070004;
-        public static final int ok=0x7f070018;
-        public static final int opening_message=0x7f070001;
-        public static final int send=0x7f07000b;
-        public static final int start_button=0x7f070002;
-        public static final int title=0x7f070022;
-        public static final int title_initialization=0x7f070009;
-        public static final int title_start=0x7f07000a;
-        public static final int tweet_error=0x7f07001e;
-        public static final int tweet_progress_text=0x7f070017;
-        public static final int tweet_progress_title=0x7f070016;
-        public static final int twitter_id=0x7f070011;
-        public static final int twitter_id_summary=0x7f070012;
-        public static final int twitter_key_edit_hint=0x7f07000f;
-        public static final int twitter_notauth_message=0x7f070015;
-        public static final int twitter_password=0x7f070013;
-        public static final int twitter_password_summary=0x7f070014;
-        public static final int twitter_secret_edit_hint=0x7f070010;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package jp.or.cute.sangokushi;
+
+public final class R {
+    public static final class anim {
+        public static final int logo_scale=0x7f040000;
+    }
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int solid_blue=0x7f060001;
+        public static final int solid_green=0x7f060002;
+        public static final int solid_red=0x7f060000;
+        public static final int solid_white=0x7f060004;
+        public static final int solid_yellow=0x7f060003;
+        public static final int start_button=0x7f060005;
+    }
+    public static final class drawable {
+        public static final int castle=0x7f020000;
+        public static final int desert=0x7f020001;
+        public static final int dra=0x7f020002;
+        public static final int forest=0x7f020003;
+        public static final int gi=0x7f020004;
+        public static final int gi_bg=0x7f020005;
+        public static final int go=0x7f020006;
+        public static final int go_bg=0x7f020007;
+        public static final int grass=0x7f020008;
+        public static final int icon=0x7f020009;
+        public static final int king=0x7f02000a;
+        public static final int king_back=0x7f02000b;
+        public static final int loading=0x7f02000c;
+        public static final int logo=0x7f02000d;
+        public static final int map_draft=0x7f02000e;
+        public static final int mountain=0x7f02000f;
+        public static final int openingback=0x7f020010;
+        public static final int player=0x7f020011;
+        public static final int player_back=0x7f020012;
+        public static final int street=0x7f020013;
+        public static final int syoku=0x7f020014;
+        public static final int syoku_bg=0x7f020015;
+        public static final int tree=0x7f020016;
+        public static final int water=0x7f020017;
+    }
+    public static final class id {
+        public static final int Button01=0x7f080023;
+        public static final int ChatView=0x7f080007;
+        public static final int EditText01=0x7f080022;
+        public static final int LinearLayout01=0x7f080000;
+        public static final int LinearLayout02=0x7f080001;
+        public static final int LinearLayout03=0x7f08000a;
+        public static final int LinearLayout04=0x7f080002;
+        public static final int LinearLayout06=0x7f080014;
+        public static final int ListView01=0x7f080015;
+        public static final int MapView=0x7f080008;
+        public static final int ScrollView01=0x7f08001e;
+        public static final int StatusDetailView=0x7f080009;
+        public static final int StatusView=0x7f080005;
+        public static final int TableLayout01=0x7f080017;
+        public static final int TableRow01=0x7f080018;
+        public static final int TableRow02=0x7f080019;
+        public static final int TableRow03=0x7f08001b;
+        public static final int TextView01=0x7f08000b;
+        public static final int TextView02=0x7f080003;
+        public static final int TextView03=0x7f080004;
+        public static final int TextView04=0x7f08001a;
+        public static final int TextView05=0x7f08001c;
+        public static final int TextView06=0x7f08001d;
+        public static final int Title01=0x7f080012;
+        public static final int Title02=0x7f080013;
+        public static final int TweetListView=0x7f080024;
+        public static final int WholeMap=0x7f080006;
+        public static final int edittext_name=0x7f08000e;
+        public static final int loginBtn=0x7f080011;
+        public static final int logo=0x7f08001f;
+        public static final int map=0x7f080016;
+        public static final int name=0x7f08000d;
+        public static final int presetBtn=0x7f080010;
+        public static final int serif=0x7f08000f;
+        public static final int start_button=0x7f080021;
+        public static final int title=0x7f08000c;
+        public static final int tweet_name=0x7f080025;
+        public static final int tweet_tweet=0x7f080026;
+        public static final int twitter_image=0x7f080020;
+    }
+    public static final class layout {
+        public static final int battle=0x7f030000;
+        public static final int initialization=0x7f030001;
+        public static final int list=0x7f030002;
+        public static final int lobby=0x7f030003;
+        public static final int main=0x7f030004;
+        public static final int map=0x7f030005;
+        public static final int opening=0x7f030006;
+        public static final int popup=0x7f030007;
+        public static final int tweetlist=0x7f030008;
+    }
+    public static final class raw {
+        public static final int bgm=0x7f050000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f070000;
+        public static final int auth_progress_text=0x7f070008;
+        public static final int auth_progress_title=0x7f070007;
+        public static final int authenticate_button=0x7f070003;
+        public static final int authenticated=0x7f070005;
+        public static final int bad_value=0x7f070006;
+        public static final int cancel=0x7f070019;
+        public static final int chat_edit_hint=0x7f07000c;
+        public static final int commander=0x7f07001c;
+        public static final int compete=0x7f07001a;
+        public static final int game_user=0x7f07001d;
+        public static final int general=0x7f07001b;
+        public static final int login_button=0x7f07000e;
+        public static final int login_settings=0x7f07000d;
+        public static final int menu_reset_userstate=0x7f07001f;
+        public static final int menu_reset_userstate_comlplatemessage=0x7f070020;
+        public static final int menu_reset_userstate_notregistered=0x7f070021;
+        public static final int not_authenticated=0x7f070004;
+        public static final int ok=0x7f070018;
+        public static final int opening_message=0x7f070001;
+        public static final int send=0x7f07000b;
+        public static final int start_button=0x7f070002;
+        public static final int title=0x7f070022;
+        public static final int title_initialization=0x7f070009;
+        public static final int title_start=0x7f07000a;
+        public static final int tweet_error=0x7f07001e;
+        public static final int tweet_progress_text=0x7f070017;
+        public static final int tweet_progress_title=0x7f070016;
+        public static final int twitter_id=0x7f070011;
+        public static final int twitter_id_summary=0x7f070012;
+        public static final int twitter_key_edit_hint=0x7f07000f;
+        public static final int twitter_notauth_message=0x7f070015;
+        public static final int twitter_password=0x7f070013;
+        public static final int twitter_password_summary=0x7f070014;
+        public static final int twitter_secret_edit_hint=0x7f070010;
+    }
+}

Modified: trunk/OpenSangokushi/res/layout/opening.xml
===================================================================
--- trunk/OpenSangokushi/res/layout/opening.xml	2011-02-04 18:20:43 UTC (rev 482)
+++ trunk/OpenSangokushi/res/layout/opening.xml	2011-02-04 18:29:56 UTC (rev 483)
@@ -9,27 +9,10 @@
 		android:id="@+id/start_button" 
 		android:layout_width="wrap_content" 
 		android:layout_height="wrap_content" 
-		android:textSize="30px" 
+		android:textSize="40px" 
 		android:padding="5px" 
 		android:layout_gravity="center_horizontal" 
 		android:textColor="@color/solid_white" 
-		android:layout_marginTop="270dp" android:text="@string/start_button" android:background="#00000000"></Button>
-	<Button 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content" 
-		android:textSize="30px" 
-		android:padding="5px" 
-		android:layout_gravity="center_horizontal" 
-		android:textColor="@color/solid_white" 
-		android:text="@string/authenticate_button" android:id="@+id/twitter_button" android:layout_marginTop="5dp" android:background="#00000000"></Button>
-	<Button 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content" 
-		android:textSize="30px" 
-		android:padding="5px" 
-		android:layout_gravity="center_horizontal" 
-		android:textColor="@color/solid_white" 
-		android:text="@string/login_button" android:id="@+id/lobby_button" android:layout_marginTop="5dp" android:background="#00000000"></Button>
+		android:layout_marginTop="330dp" android:text="@string/start_button" android:background="#00000000"></Button>
 
-
 </LinearLayout>
\ No newline at end of file


Property changes on: trunk/OpenSangokushi/res/layout/opening.xml
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/OpenSangokushi_without_twitter/res/layout/opening.xml:477-482

• 前の記事 [Sangokushi-svn] [SVN_Comitted] [482] オープニング時のTwitter認証のみ外したものをTrunkに反映。
• 次の記事 [Sangokushi-svn] [SVN_Comitted] [484] 今日、もとの状態でテストしていましたが、akifumi3さんに行って頂いた修正と、プレイヤーの位置が飛んでしまうのは、無関係でした。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]